search: Fix previous commit

It was pushed by accident before it was tested...

diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 0e924323802e02e0759ad8b9cb56648dd5775c6d..aad503252aadc241659c82cf6b83b779908af889 100644 (file)
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -894,8 +894,8 @@ const AppSearchProvider = new Lang.Class({
         callback(this._appSys.initial_search(terms));
     },
 
-    getSubsearchResultSet: function(terms, callback, cancellable) {
-        callbacl(this._appSys.subsearch(previousResults, terms));
+    getSubsearchResultSet: function(previousResults, terms, callback, cancellable) {
+        callback(this._appSys.subsearch(previousResults, terms));
     },
 
     activateResult: function(result) {

diff --git a/js/ui/remoteSearch.js b/js/ui/remoteSearch.js
index e21416e06cf43f38b4be0e6db8e51c2842279e9a..cd95069ea8df1242a3efe6c10d09c8ef4a33c176 100644 (file)
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -249,7 +249,7 @@ const RemoteSearchProvider = new Lang.Class({
                                              cancellable);
     },
 
-    getSubsearchResultSet: function(previousResults, newTerms, cancellable) {
+    getSubsearchResultSet: function(previousResults, newTerms, callback, cancellable) {
         this.proxy.GetSubsearchResultSetRemote(previousResults, newTerms,
                                                Lang.bind(this, this._getResultsFinished, callback),
                                                cancellable);

diff --git a/js/ui/search.js b/js/ui/search.js
index 1b2953a9875726886b400b325d043928713119d3..4bde7fcba31ed9e4ace6836271abf78873543164 100644 (file)
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -112,8 +112,8 @@ const SearchSystem = new Lang.Class({
 
         if (isSubSearch) {
             this._providers.forEach(Lang.bind(this, function(provider) {
-                let previousResults = previousResults[provider.id];
-                provider.getSubsearchResultSet(previousResults, terms, Lang.bind(this, this._gotResults, provider), this._cancellable);
+                let previousProviderResults = previousResults[provider.id];
+                provider.getSubsearchResultSet(previousProviderResults, terms, Lang.bind(this, this._gotResults, provider), this._cancellable);
             }));
         } else {
             this._providers.forEach(Lang.bind(this, function(provider) {